(dos-8+3-filename): Rename from dos-truncate-to-8+3.

All callers changed.

diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 5280280be2bef8aed598a8fba76b11a7b298f222..09267c28c18fcb15f3f61c24dbedabf3bd3186d4 100644 (file)
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -114,7 +114,7 @@ with a definition that really does change some file names."
                    (convert-standard-filename dir))
                  string))))))
 
-(defun dos-truncate-to-8+3 (filename)
+(defun dos-8+3-filename (filename)
   "Truncate FILENAME to DOS 8+3 limits."
   (if (or (not (stringp filename))
          (< (length filename) 5))      ; too short to give any trouble
@@ -122,7 +122,7 @@ with a definition that really does change some file names."
     (let ((flen (length filename)))
       ;; If FILENAME has a trailing slash, remove it and recurse.
       (if (memq (aref filename (1- flen)) '(?/ ?\\))
-         (concat (dos-truncate-to-8+3 (substring filename 0 (1- flen)))
+         (concat (dos-8+3-filename (substring filename 0 (1- flen)))
                  "/")
        (let* (;; ange-ftp gets in the way for names like "/foo:bar".
               ;; We need to inhibit all magic file names, because
@@ -166,10 +166,10 @@ with a definition that really does change some file names."
              (aset string (1- (length string)) lastchar))
          (concat (if (and (stringp dir)
                           (memq (aref dir dlen-m-1) '(?/ ?\\)))
-                     (concat (dos-truncate-to-8+3 (substring dir 0 dlen-m-1))
+                     (concat (dos-8+3-filename (substring dir 0 dlen-m-1))
                              "/")
                    ;; Recurse to truncate the leading directories.
-                   (dos-truncate-to-8+3 dir))
+                   (dos-8+3-filename dir))
                  string))))))
 
 ;; See dos-vars.el for defcustom.

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index a4d52f5a53c8968fc9bc354c2f4c1d4b6f452280..004dc7b8b83c731f892d89fb1cced70a096bc1c4 100644 (file)
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -983,7 +983,7 @@ the generated Quail package is saved."
                ;; Give DOS users a chance...
                (and (fboundp 'msdos-long-file-names)
                     (not (msdos-long-file-names))
-                    (string-match (dos-truncate-to-8+3 (nth 2 (car tail)))
+                    (string-match (dos-8+3-filename (nth 2 (car tail)))
                                   filename)))
        (setq slot (car tail)
              name (car slot)